Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

capture(ticdc): fix the problem that openapi is blocked when pd is abnormal (#4788) #5110

Merged
merged 1 commit into from
Apr 14, 2022
Merged

capture(ticdc): fix the problem that openapi is blocked when pd is abnormal (#4788) #5110

merged 1 commit into from
Apr 14, 2022
+52 −34

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4788

What problem does this PR solve?

Issue Number: close #4778

What is changed and how it works?

  1. Avoid holding a mutex lock in a blocking operation.
  2. Add timeout control for EtcdClient get and put operations to prevent possible goroutine leak in openapi.
    rZvF5Nx4BM
  3. Remove redundant retry operations in (*openApi).forwardToOwner

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note 

`Fix a bug that openapi may be stuck when pd is abnormal`

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 2, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 2, 2022
Merged
@ti-chi-bot ti-chi-bot added component/api HTTP API. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. labels Apr 2, 2022
@overvenus overvenus added this to the v5.2.4 milestone Apr 14, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 14, 2022
@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4788-to-release-5.2 branch 4 times, most recently from f071cc6 to 4bd8283 Compare April 14, 2022 08:27
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4788-to-release-5.2 branch from 4fd22ad to 9a1b1d8 Compare April 14, 2022 09:20
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 14, 2022
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96
Copy link
Contributor

/run-integration-tests

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 9a1b1d8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@asddongmen
Copy link
Contributor

/run-leak-tests

@ti-chi-bot ti-chi-bot merged commit 334f3ab into pingcap:release-5.2 Apr 14, 2022
@VelocityLight
Copy link

ref #267

CharlesCheung96 pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jun 16, 2022
@ti-chi-bot @CharlesCheung96
capture(ticdc): fix the problem that openapi is blocked when pd is ab…
b130ddb 
…normal (pingcap#4788) (pingcap#5110)

close pingcap#4778
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@CharlesCheung96 CharlesCheung96

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/api HTTP API. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR.
Projects
None yet
Milestone
v5.2.4
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @CharlesCheung96 @amyangfei @asddongmen @VelocityLight @overvenus